merge conflict kaise solve kare